gtk/gtklinkbutton.h Change function argument "link" to "link_" to fix

2007-06-04  Cody Russell  <bratsche@gnome.org>

        * gtk/gtklinkbutton.h
        * gtk/gtkaboutdialog.h: Change function argument "link"
        to "link_" to fix warnings for applications compiling
        with -Wshadow. (#379213)

svn path=/trunk/; revision=18033

diff --git a/ChangeLog b/ChangeLog
index 33d185423834afb996dfb425d72063911f8fae49..2e2055a7bf58fdfc605e77c057a31ac9b71d52cf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-06-04  Cody Russell  <bratsche@gnome.org>
+
+       * gtk/gtklinkbutton.h
+       * gtk/gtkaboutdialog.h: Change function argument "link"
+       to "link_" to fix warnings for applications compiling
+       with -Wshadow. (#379213)
+
 2007-06-04  Cody Russell  <bratsche@gnome.org>
 
        * gtk/gtkpathbar.c (gtk_path_bar_scroll_down): Check

diff --git a/gtk/gtkaboutdialog.h b/gtk/gtkaboutdialog.h
index 29555b8d342580fa55bbb4fb0f8f47e32ddaf5f5..b77e658c196ffaab0f1a546115f54c1570908841 100644 (file)
--- a/gtk/gtkaboutdialog.h
+++ b/gtk/gtkaboutdialog.h
@@ -115,7 +115,7 @@ void                   gtk_about_dialog_set_logo_icon_name     (GtkAboutDialog
                                                                const gchar     *icon_name);
 
 typedef void (* GtkAboutDialogActivateLinkFunc) (GtkAboutDialog *about,
-                                                const gchar    *link,
+                                                const gchar    *link_,
                                                 gpointer        data);
 
 GtkAboutDialogActivateLinkFunc gtk_about_dialog_set_email_hook (GtkAboutDialogActivateLinkFunc func,

diff --git a/gtk/gtklinkbutton.h b/gtk/gtklinkbutton.h
index 92b48512e0a3ff64c6653a028349509ae87631c1..24e79b460c9b9e6ebec1062f10ff5c017052f2c7 100644 (file)
--- a/gtk/gtklinkbutton.h
+++ b/gtk/gtklinkbutton.h
@@ -42,7 +42,7 @@ typedef struct _GtkLinkButtonClass    GtkLinkButtonClass;
 typedef struct _GtkLinkButtonPrivate   GtkLinkButtonPrivate;
 
 typedef void (*GtkLinkButtonUriFunc) (GtkLinkButton *button,
-                                     const gchar   *link,
+                                     const gchar   *link_,
                                      gpointer       user_data);
 
 struct _GtkLinkButton